Misc small changes.