Corrections to match system and to coding standards (tags)