#1432 fixes for stand alone tomcats