Fixed storage setup and re-enabled trap exit