Minor fixes before release