Various fixes to Table expressions