Finishing touches for 3.0 stable