Build some nuclear power stations and you'll fix both. While you're at it build a breeder reactor and feed it with stored nuclear waste to both produce new fuel for other stations and reduce the amount of radioactive waste which needs to be stored as well as the period for which it needs to be stored.