Fixing some stuff to make install add-on work