Fix linux issues