Path tweaks to get FAM fully compiling again.