Fixed linux issues