Fix commands for SAM