Some fixes before release :)