more space fixes