Fix dynamic variables