some minor fixes from parallel repo