Fixes for 2.7.x