use modifier keyword for diagnostics
some minor correction to suppress build warning messages