Fixing problems dscovered by test/gun

No match.