Fixes for SnapChat 4.x + Storage Location