Fixed more helper-related growing pains