Initizalition fixes
Initizalition fixes
Integration fixes