Adding missing fixes