Fixes to get this to actually install.