Resolved some dependency issues