A few random fixes.