Misc tweaks, demo test.