Final fixes for production v.0.4.0.