Added a few more issues