Add missing dependencies, fix whitespace