Quick fixes 4/10/18

Follow