Also, bug that prevented things from compiling.
Sorry for last-second changes.

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>