Fixes  some core syntax format issues (reported by CI server)