Fixing inconsistencies with new changes (TBA).