Fix bad Include line when using XAMPP for Linux and other minor fixes.