Some cosmetic fixes to get rid of infamous warnings.