Some minor fixes in controls and backend