Align and Copy Fixes