Fixing issues in build