Minor fixes, table generator borked without enough items (whoops).