Improve Galileo support (fix #667)