Fix a couple of remaining issues for Linux build

Courtesy of @Luke-Nukem.