contrib: fixed some STYLE-WARNING conditions