Quick fixes - 5/22/18

Follow