fixed various issues for compatibility with Nuntius