Fix non-Griffin build