Fixes and release