Bug fixes after testing with Arc interface