Quickwins

Various minor updates.