Fixing errors in build