Fixed dependencies for new upstream and changed to new upstream