Various enhancements to the code base.