usage fixes