Few random fixes.