Doc and a fix