more fixes

Signed-off-by: Cristian Stoica <crististm@gmail.com>