Quick fixes - 6/8/18

Follow