Misc small improvements.