Modifications for linux compilation, ongoing