Delete & messages fixes