Upgrading to 5.0.7