Some fixes before release