Fixes for drawing domains