Fix different misprints and deps after latest commits