Fix KVO deregistration