fix a few regressions that snuck in when i was divying up the commits yesterday.