Make the code compile on latest linux systems (not thouroughly tested yet