Fixes for new Sorbet API