Fix usage bugs