They should be fixed in this PR as well via 1d5ee47.