Fixed usage bugs