Fixed dispose on a couple types. Fixed interface method naming.