Fixes curve arc size
Merges with master