Various additional minor fixes