Port bug fixes from old project.