This fixes some GCC 6.3.0 warnings and makes the code a little more debugging-friendly.
Attach a file by drag & drop or click to upload
