Minor close() calls in Manipulator