Fixing issues with HbplusRunner