Actually include the amends I thought were in the previous commit