fixes for 4.1.2