Update some minor check and new deployment file

Update minor check on condition to convert.
Update new deployment file.