Small init fixes.