[OLINGO-416] fixes for rat tools II