Fix up some dependency issues. All good now.