more close fixes