Bug fixes and no blending