Fix miscellaneous issues.