further fixes for handling the record type change scenarios.