Make things work

These errors... Just... Just disregard this commit, please?
I really need some test. Now please give me some time to code
proper tests and repent for these sins.

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