Build and tclap tweaks