more helper fixes