Fixes for BUILD TIMEOUT in lychee.Environment and sorbet