StorageEvent hotfix and slight clean up