FreeImage:  Some fixes for build process