Further fixed linux compatibility errors