Fixes and prepare to release