Fixes from Misha