3 small changes, see details in each commit