Before release fixes