Quick Fix

Couple of quick fixes