Hi. I would add some greens since it sounds like you're not getting any dairy. Greens are a decent source of calcium. Think spinach, kale, broccoli, etc.

As long as you're getting your veggies, you're probably fine. Usually when we encourage people to get their 20 g, it's because they're "spending" their carbs on a little too much cream, cheese, coffee, etc and not eating enough veggies. Part of your 20 g allowance is for those kinds of things, so if you're skipping them, it's no problem.