Fixed up helpers etc