Fixed more dependency issues