Small old fixes not published