From now on things like that should go in the small changes thread. In both those cases the comma isn't nececary, you don't put a comma in on the last word as there's "and" or "or".