Made multiple minor changes to better support other projects.