Fixes to controller/server