minor fixes from main repo