Fixed cleanup issue
Fixed some issues