Fixes for Camera