Fixed Usage bugs