Warning resolution besides "Type safety" issues.