Try to fix a few more of the install/compile time errors