Bugfixes to enable variable marker sizes