some fixes & HQC