few hotfixes for topaz