Update to ensure Server 2012 still works