Fixed aftereach usages that broke the build