Fixes according to feedback from @jcarlosgarcia and @puentesarrin #401.