Minor changes for generating documentation properly