Fix /usr/etc/ and /var/local issues