Minor random fixes.