Various FIXES
Passato a RoboGuice
FIXES