m setup fix

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

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