misc fixes from testing