Fix implicit var issues