SASS touchups on previous checkin