Fixed warnings

"dll-interface" warnings fixed.
Minor refactor