Backport more skyeye fixes from 3dmoo