Mix fixes before 1.0.2 release