Fix table arg bug, better optional handling