Fixes according to feedback from @jcarlosgarcia #403.