Add missing bits after clean build