Fixes to be properly installable