More GNU support