Map vertical scrolling block fix (and a bit more)