Added misha and hanan fixes.