Fixed more issues