Fix for full build with new file tree