Camera bug fixes