Fix up some more linux-c6 ports