Fix camera handling