peq's fixes