BUGFIX: Improve copy and correct instruction alignment