Ultimate fixes