Base: Minor space fixes