Fixed Linux compat issues