Fixed broken references for global instances.