Map objects rendering fixes