Fixes new packaging and install