Some more issues solved