Updates for 2.5 compatibility