Cleanup PR merge mistakes