Call_with_options corrections