Fix up CM and TW 4.4