Fix more odds, ends, and bugs.