some tweaks to keep modern compilers happy - also paving way to split development