A few changes related to #1690