Bug fixes of space