Fixes for Events Manager version 5.5.2