m + add warnings

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

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