Minor fixes

P.S. Test is still broken because /controls/switches/starter doesn't behave like it did in old versions.