Various changes
Signed-off-by: naso