some other space fixes