Minor bugfixes.
Merge branch 'master' of github.com:e-ucm/ead into mockup