Fixing some clear issues