Two bugs, one commit.