Fixes to assorted instructions