Fixing bugs in the build