Fix whenever vars