Last minute fixes before 0.10 release