fixes reported here: https://github.com/xbianonpi/xbian/issues/561