Fixed some building issues
Merge branch 'bootstrap-daemon-dynamic-info-reply' into bootstrap-daemon-dynamic-info-reply-config