Build/bug fix for Linux