fixes for small bugs in the previous checkin