Make build pass again