First release fixes