Congreso fixes

I accidentally did the Congreso fixes on my branch Issues/74, but as you can see, both commits in this pull request are fixing Congreso's issues.