Quick fixes - 4/26/18

Follow