Fix recursive let issues