Little fixes

Little fixes suggested by Eclipse