Patch to address several small things