Small, mostly cosmetical fixes