Fixing some usage bugs