Changes to fix updating from jTable