small fixes for 2.7