Fixes before final release