Space fixes