Restore missing file
minor fixes