Added fixes for initial usage