Fixes for GoCommandHandler