cream ts fixes