- Use a more robust way of determining the location of the setup script - Style fix: make INCLUDE path constant