Small fixes again

Signed-off-by: Roet-Ivar <nicoful@gmail.com>