More problems to be fixed