Fixes. Test compiles now, but segfaults (that's something new in this
project...).