Various fixes

What is the problem with trailing comma ?