Various fixes to log and label on map