fixes to better deal with missing files and include paths