Linux build fixes #919