Improve manual initialization.