Adding fixing some more issues