some smaller undef-fixes