More camera and scrollBlocker fixes