[OLINGO-317] Minor bugfixes