Fix for a couple of undefined classes in docblocks