Fixes in Doc model