Some fixes as preparation for release