Fix info messages and remove `diff` check