A few cleanup fixes

#4