More fixes for #2409