Small fixes... Upcoming: Fix table naming convention