Small changes for CodeStock.