minor fixes from last push