[fix] more fixing of aftermath nonsense