Several fixes + typo