Fixing some warnings and some coding convention rule violations (Roberta)