Add some missing fixes