proposed fixes for pull request 16 to nemomobile/libconnman-qt