Small fixes + typo