Fixes missed from the earlier commit