Fixing code issues.