hammer_cli - fixes