Added dispose to type where it makes sense.