Fix choupom errors