Fixes to controls and markers.