Fixed certain minor issues.