Fix null params