Fix NSUserDefault key observing issues