bug fixes to enable cmake compilation on WIN32 platform (see CHANGES for details)