More space fixes