Cleanup, minor fixes