Lot of little fixes