Address issues with help functions