Fixed various minor issues.