A myriad of little fixes