fix issues with the linux build following recent changes