misc changes towards tp #1240