Additional changes needed to have the BeEF integration features working after merging upstream.