Still tweaking the build/install system