Minor 4.1 fixes