[cp0028] Improvements for pets. Patch provided by Gorfen