hot fixes from review