Fix some mismatch issues with sql schema
temporary hack to fix sql issue