Replace some raw instructions