Fix a couple more shared health bugs