Misc. fixes sitting around locally.