Minor changes to include paths