Mother and Father entry bug fixes