Fixed some more issues