Fixed a few miscellaneous issues.