last-minute fixes related to Linux build