Fix Comma Issues when Required Features exist but no optional ones