Fixes for valgrind errors and compatiblity issues by Monty
Attach a file by drag & drop or click to upload
