Minor modifications for Linux