More instruction fixes