mish fixes - first gruop