Maps fix & companies init v1...
Maps fix & companies init v2...