Fixed some objects that were not correctly disposed.