Random fixes around the project.