minor fixes from testing