Fixes bugs introduced by new install conventions