Adding dependencies (bug 936132, 936134)