Bug Fixes for Variable class