Fixes to make the installation work.

Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com>