Added fixes that were added during the project.