Fixes to child controller