Fix any issues tests didn't pick up on
2 files changed