Fixing type issues.