moar viewport fixes