Fixes for supporting new Pyre #24

linked to Issue #24