Fix doc and buglets in last change