Generic Parameter Fixes (not finished)