Some linux-ism removed