Fix issue with shell script wrapper, add rollback ability