* [DEP,FIX] Various fixes.