Beta related fixes

There are some problems when running legacy templates like "new-black" for example.

This, together with phpDocumentor/phpDocumentor2#807 resolves the most critical issues.