Fix some dependency issues