Polish

Preparation for linux contribution.