fixes for SF 2.3