fixed some dependencies in 2_1. not done yet