Use VFR heading again, minor cleanup