More fixed to make it work with KonyOne Server