Some updates to helpers