Some fixes in MarkerPlus