Fix for docIn-support, fix for span-class