Minor finalizations