small bug fixes

Signed-off-by: Mattias Andrée <maandree@operamail.com>
small bug fix

Signed-off-by: Mattias Andrée <maandree@operamail.com>
makefile fix

Signed-off-by: Mattias Andrée <maandree@operamail.com>