Fixes before release