Remaining random fixes.