Merge "Use dlsym on correct object"