Some changes that should hopefuly make building on Linux easier