A couple more solutions

22 + 25 are solved, not particularly elegantly, but they get the job
done