Fixed several minor issues.