Merge and Fixed linux compile errors