Better support for DocBlock Documentation generation
Fixes for previous commit