Fixes for Sorbet