fix MapWindow regression introduced by 9c49f1acd182ed85ab635f490ed8502d65c0da32
make some class attributes -> instance attributes for now