Quick fixes - 7/12/18

Follow