Four smaller changes and fixes