Minor changes to stack helper to transition to new version integrated with NFD