A few more minor fixes