Fix bugs with helpers blocking requests