Misc updates.

Tested in testbed.