Fix dependencies. Fix syntax errors