Minor fixes + preparation for next release (2.6.0)