Implementing fixes from non other, than THE POPE.