Minor fixes based on reading DXTK again