Helper improvements (partially)