Wrap-mode improvements