Fixing build after de-xercification