Changes for build with no errors and modules