Pry and fixes