FIxed more issues