0.2.61 - More fixes