small fixes for 2.2 compat