Fix RecordNotFound messages