fixing some inconsistencies with controller definitions