Fixes for controller API
DB