Bug fixes across a few files.