Fixes to work with OIPA V2.1 API