Made even more health fixes