A few cleanup fixes