More head tracking bug fixes