Fix an issue with Pry >= 0.10

Related: https://github.com/pry/pry/commit/4e9df5b901cb8cab044345c2e561b06cb8e7d69f
Some updates