A few more helpers
small fix
resolving conflicts