Freelook fixes

Addresses issues 7692 and 7147.

Also, I have no idea if this will affect Windows or Mac users.  Does it work on Macs with master?