Changes to downgrade gem to 2.0 compat