New dependencies and misc fixes