small fixes for OS X
Resolved merge conflicts with Converter.h in include/libmmmp.h