Proguard fixes and BackUp called after import