6cdfefad87
Both were failing due to interface changes that were never applied to them properly. This commit was SVN r15082.