Various fixes upon feedback from Ghusse