Tweaks for CodeStock.