Fixes from Meng for streetview orientation