Fixes and wrap