Readd logging; simplify offlineSave key collision check