Fixing dependencies
Fixing config and initializers