Fix modern compiler"s warnings
Step 6! Need to test more