Fixes, prepared for release