A few other cleanup fixes