Couple more problems are solved.