minimal changes to restore build