[redeploy] added more bug fixes