Fixes and remixes