couple more changes related to prior commit