Fixing for install + dev