A few final fixes - should be ready for release