Fix Painted Item rendering with some items
Tweak Pump