Fix camera/kitkat changes