Fix quil issues