Fixes for new doc dir structure.