Some minor fixes for table names