Modify projects to try and get CI build right