Fixes and helper functions for bundle exec.