Fixes for my Linux VM build