Minor fixes
Fix orientation change and controller subscriptions