Fixes for issues uncovered by 1.9 merge