Fixing building issues