Misc tweaks for v1.003.