Fixes to Spring controllers