[cp0124] Some very old fixes