Fixing uses
Testing on PHP 5.4.4, production version