fix some warnings

Signed-off-by: Mattias Andrée <maandree@operamail.com>
fix some warnings and simplify data types

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