Minor improvements from beta logs analysis