Minor misc work.