Assorted pr fixes.