fix bugs so we can release this w/ 2.2