minor fixes from pr comments