Adopt and fix gfa package