Space bug fixes