option usage fixes