Table name / guid fixes