Minor helpers added