Added some binary formats
Fixed compile errors under OSX