Fixes for onCreate() and onRecover() in Controller