Quick fixes - 1/5/18

Follow