Fixes for instructions