Added some missing dispose calls