A few more fixes related to the recent change.