Fixing some errors & missing dependencies.