minor fixes for including marker class