Return tables over exporting

* Also fixed a couple issues pointed out by moonc -l