Minor changes to helpers