fixes for 1.4.6p2, see CHANGELOG for details