Further improved linux build