Improve build properties for both projects and resolve errors