Fix argument length on activate/deactivate