Fix issues with ALTER TABLE