A couple of clean-ups