Fixed a few table and source issues