Fixed assorted issues.