Linux: Small changes to work for Linux