Bugfixes: various
Table upgrade