Fix any issues tests didn't pick up on