Fix

Minor tweaks