hotfixes after #6225

This was in PR to codehero branch.