Improve cross-plateform compatibility