Add missing fixes