Fixes integration bugs

Needs now to fix backup