Fixes to dox system.