Added fixes from a parent repository