Moved back to KVO, fixed the issues and all looks fine now