Re #1675 Fixing dependency issues.