mish fixes - 3

Fix from latest mail