Fixes to make install process work