Slightly modifications.

Signed-off-by: Gianni Valdambrini <aleister@develer.com>