Fixes for 4.1.1