A few changes and fixes before tagging