Arc related tweaks