Lint+BUGFIX: now compiles :P

The previous commits were lies... Now it actually compiles.