Fixed dependency issues for build