Some helper fixes