Merge small improvements from this week branch into Develop branch