Misc fixes from valnet issues.