Fixing wrappers and some movement