fixes for 14.1
14.1 fixes