Some fix for modern linux systems