Small fixes.

Signed-off-by: Daniel Josefsson <dannejosefsson@gmail.com>