Few more fixes for S3 delete option