Fixes following @jdoliner and @mlucy comments