Fix make.tables