Changes to fix camera bug