Fixes to marker plugin