Fixes missed from the earlier commits