Bugfixes in table()