bug fix and m clean-up

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