Bug fix to 2.0 to 2.1 conversion script, bug fix to alter table