Fix bugs  from field rename of owner -> user