Path tweaks to get it fully compiling again.