Some random fixes.