fixes for 1.4.6p2