Dox fixes