Fixed some more issues
Updates