Two tiny clean-ups