Another spaces fixes