Some platform dependent fixes and binary file