Updating STATIC variable references to work with 1.4.5