Some random changes, I think from upgrading to 2.5.x