$gCms fixes