Final set of fixes from refactor.
Final set of fixes from refactor.

heyLu/kaiwa,unam3/kaiwa,lasombra/kaiwa,weiss/kaiwa,otalk/otalk-im-client,nsg/kaiwa,ForNeVeR/kaiwa,ForNeVeR/kaiwa,warcode/kaiwa,di-stars/kaiwa,warcode/kaiwa,digicoop/kaiwa,nsg/kaiwa,digicoop/kaiwa,syci/kaiwa,lasombra/kaiwa,di-stars/kaiwa,heyLu/kaiwa,otalk/otalk-im-client,syci/kaiwa,heyLu/kaiwa,ForNeVeR/kaiwa,warcode/kaiwa,lasombra/kaiwa,rogervaas/otalk-im-client,di-stars/kaiwa,weiss/kaiwa,rogervaas/otalk-im-client,nsg/kaiwa,digicoop/kaiwa,ForNeVeR/kaiwa,birkb/kaiwa,birkb/kaiwa,birkb/kaiwa,weiss/kaiwa,unam3/kaiwa,syci/kaiwa