Android save fixes