Fixed path and dependency issues