fixes for 1.4.2