Small changes to helpers