Discovered a few more issues