Fixes from Marek to bring the secondary correction object