Fix and mingle stuff