Fixes and tweaks for putback.