Updated more issues