Fixing failing build