Added more spreadshirt fixes