Found those issues while doing a last pass