Fixing more length inconsistencies.