Fix conflicts from eselkin/master merge