last of the linux-* stuff fixed