Cosmetic fixes to SMap

Change-Id: I2b45227c19ee2d6595d52dda35a139ed3a898ce8