Some changes to make GNU make happy. There are still issues with glibc.