Fixed some bugs Timon and Pumba style.