Merge comma fixes from dev