- Fix wrapping and swapping issues