Fix

Small fixes to code