Commit Azilroka's dead pet fixes.