Linux fixes from Danni.