Fix unknown variable id warnings