MAHOUT-1597: A + 1.0 (fixes)