Miscellaneous changes from pogo test run.