Various updates I can't explain in one commit.