Fixed several issues with space edition