Use InstanceOf over raw classname, fix version