Lots of little fixes ...