More corrections for new CShirt Controller