Additional fixes for animal age handling.