Fixing build for linux & windows.