Fix bugs in variable instantiation