Fixes on table updates