Fixes global underscore references