some helper fixes