A couple more minor fixes