Some CTM fixes