Fixes for SINGULAR_4_1