Tweaks for v2.0.3