Bug fixes after testing with Arc interface

Mike to implement in TWS version