v3 API fixes, move all commands to use v3