Fix trailing comma/missing semi-colon