Fixes according to feedback from @puentesarrin #389.