Fix raw commands