Fix the previous fix
No more segfaults or compilewarnings.
3 files changed