Making fixes when migrating ot linux.