Minor bugfixes. Version XXIII.