[AutoPaster] Fixes