Small bug-fixes and improved controller support