misc. hot fixes from master