Ahh fixes for things found on linux.