Fix linux build error, slightly more cleanup.