Fixes for doc generation