Fixes for build if configure run in base directory