[PATCH 0/2] A few CT updates