Multi doc fixes

Closes #15