Fixed some serious issues around persistence with operation manager