Fix warnings
Resolve integration problems