Fixing bare build again