Fixes and modules update

Signed-off-by: Alessandro Vioni <jenoma@gmail.com>