Fix ambiguous instructions