Preparation for Node<->Application Communication; compulation fixes