Trying to fix the clavin build.