Fixed type issues throughout project.