Re #23: Attempting to fix build errors in Linux.