adding some missing fixes