Fixes to make build work after merging.