Fixes to mix integration